More de-lombok, gotta check my whitespace o-o (don't fret, this will be squashed before brought to main repo)