shotop: better naming and cleaning up