Code improvements, removed sanitisation from all output