Added class infos
Reformatting and comments rewritten
Cleanup and reformatting
Cleanup and reformatting
Cleanup and reformatting
Cleanup and refromatting