Removing debu, making code cleaner