juni 05-22 3844492 minor code cleanup and added comments UNIX