micro optimization
removed method with the same name as a variable
removed unneeded methods