Class structure optimization, codestyle fixes