Renaming and clean
Class structure