Removed unneeded formatting functions