Comments and clean up because it's an ugly mess