refactor
get ready for mystuff