Added 'm' to all the member variables