took out comments and added more code