Cleaned up some things and commented some others