Renamed for consistency. Reordered declarations. Removed old comments.