Removed comments and unnecessary variable declaration