Clean code & mini-refactors