Cleaned up some comments and spacing