Improve format and permissions