minor fixes to case and cleanup of some member declarations