Codecleanup

Here's some feedback I did while reading your code.

Note:
It is often a good idea to inject config, file and session as a dependency instead of using the facade