some changes with the header files: removed null checks from class constructor