Improved formatting and file loading