Issue #6 (finished)

Moved local variables to class