CS fixes

Going to merge this but I send a PR for the form and just to make sure you notice @tshelburne :) Minor things mostly  but I like to try and keep it consistent.