separating classes
improving readability and making increase spec pass
fixing dummy