Refactoring (corrected out of date filenames, simplified comment
iceberg)