Fix for issue #6 in EmployeeList 
+ some refactoring