Updated some classes code & started formatting