API / ENH: improve readability, drop catch

@agramfort  -- cosmits a few edits missing (+ I dropped the catch for you :)