* fixed smells and errors