Tidy up

Separated. moved, cleaned coding