Fixing specs and CS, cleaning code and tests cleaning after reviews