feature: Style tweaks, starting to replace some boilerplate