Tidying up indentation, formatting

TODO: clean up buttstick/spewp commands
CHANGES