Cleaning up code, two soft warnings, one unreachable