Improve format and remove unnecessary files