refact

Full of shiny comments