Removed class + code refactoring

overbodig en netter