fix pad not indenting, tidy up a little