Revert 76acfc6..7e246b0

This rolls back to commit 76acfc6bca1bb1bdb740760ceae0909d651574a8.
reconciled updated style guide