removed comments and unnecessary code