reorder methods
rename class