Ridded of unnecessary comments