Doc blocked and reformatted some classes