Feature/refactor class