Clean up and make some tweak