Updated readme and small code cleanup