Code readability refactor (possibly bad)
Remove unnessecary check and assignment