Cleaned up and changed some comments