Cleaned up the code :)