Refactored boilerplate
Tweaks
snippets