Address comments with luke