[Ticket #21] Move member variables from heap to stack where possible