removed comments and parameters in functions, removed not needed variables, moved functionality to classes