Action bar commenting & cleanup