Changed methods to return void and added object variables