remove newline
refactor class