#81 fixed issues after auto formatting