Removed unnecessary comments

Also added variables for easy changing of if parameters.