added new constructor style / some formating stuff