Added specs and better naming