Cleanup a bit
Adding @hij1nx's talk