yay - managed to apply code formatting
Added ability to remove formatting + some cleanup