Unnecessary comments and methods removed