Cleaned up, comments, indenting