Cleaned up some syntax. Also cleaned up a