Cleanup for @s0undt3ch and lint