Cleaned up some comments and tabs