Cleaned up the code a little