Cleanup and some adjustment