Work experience added, some refactoring.