Changed naming for consistency and cleaned up style formatting.