Skip to content

Fix/cleanup model

Fix/cleanup model #90