Import cleanup, styling, dead code pruning