cleaned up code :)