Cleaned up some code for looks and speed. Cleaned up some comments, too