use consistent and standard naming conventions, remove redundant methods