naming and unnecessary checkings fixed