Refactorings...
Code cleanup