Move comments for clarity