Fix not working, and refactor

:(
Redundant `return` detected.