Formatting Fix

Fixed inconsistent indentation and added explicit "public" to public data members.