Small refactors/beautifications