Clean up formatting, add work