Some cleanup
Merge pull request #294 from nu-lts/feature/files_controller_update

Some cleanup