uneccesary comments removed