cleaning up the project & writing tests