Cleanup code & unit tests