added settings and cleanup of comment