Big refactor & deshitification