Cleaned up my code a little.