Refactors form file for readablity