Committed recommended changes from @juwon