cleaner code :D