More DRY refactorings, new blog post
Some indentation for better readability