Cleanup and tweaking
Test