Refactoring

Occasional refactoring to make the code more robust and clean is an important part of any project. In following the boy scout principle, when touching the code, one leaves the code cleaner than it was previously. In this way, when any real functionality change becomes necessary, cleaner code may make it easier to implement it.