WIP Refactor spacing and remove comments