removed comments from code
renamed things correctly