removed unnecessary methods and comments