Make code cleaner and on both sides