More clean code :D