Add stuff from @elijahmanor to refactoring post