formating
refactoring-ish
tidy up