Style and markup edits, makes kick_fucnitons and snare_functions reliable.