Refactors/additions based on feedback