Code cleaning: Member variables