Code cleanup

Cleaned up a few things in my added code