Code refactoring: more neat stuff!