Updated README + cleanup