Updated readme, code cleanup