Tidyup first commit