cleanup
refactor class layout and names