Move code into private function so more DRY
clean up code in default.php
removed some words
Merge remote-tracking branch 'origin/development'
Merge remote-tracking branch 'origin/feature-ajax' into shitty-bbcode-styling