Cleaned up code!