1) Cleaned up the code a little