Formatted and minor improvements