WIP: Refactor spacing and hash syntax