Cleaning up / preparing to write tests