Adjusted commenting and code housekeeping