Cleanup and part of README