Readme writeup + more code cleanup