first commit
tidyup