refractor and rename and stuff