Tidy up
Fix more and less