fixed lint rules and added new methods