code cleaned, new classes