Comments and shit
Some cleanup