Cleaned up my code.