Some Refactoring, deleting obsolete code, adding Authors