Make code cleaner and better