steven review

Be careful @Lkroner et al., these changes weren't tested .. they're more..guidelines :)