Clean up i drobny refactoring