Whitespace/style

Signed-off-by: Stefan Marr <git@stefan-marr.de>
Added missing immutable fields to Class

Signed-off-by: Stefan Marr <git@stefan-marr.de>