cleaned up + small fix