Fix: gotta return something
Fix: small cleanups