Cleanup

Tiny tweaks and cleanup :)