Cleanup code and specs