fix #21 and #16 - underscore style and drop model::id