Updated readme; cleanup