Updated readme, cleanup code