Casual changes

just added comments and deleted some redundant methods xD