Update readme and cleanup

Update the readme and remove unnecessary global variable. Also removed
the early return as it didn't change anything.