address @laughedelic comments, polish things a bit