Added less. Started code refactoring