Cleaned up the code a little, fixed some redundancies