Mainly syntax cleanup

:feelsgood: Woops, I forgot to create a feature branch though.