Remove needless return
Remove needless defaults
Remove needless if/else