General cleanup, absolute imports, and lint clean.