refactoring

making code look nice :)