Removed uggly code :)