Cleanups + little improvements.