neatened code - using coffee shortcuts and removing non useful parenthesis'