cleaned up lot of comments