Cleanups + specs