Code cleanup + tests package begun implementation