Little cleaning of code :)