Reorganized comments for better logic