Code better organized and cleaner