Refactoring and cleanup -16LOC