Cleaned up code

Just some quick code edits to clean up the code really quick