Cleaned up the code!