Tidying up code and correcting PSR-2 formatting errors
I helped
Removing "TODO" storage implementations, will add when done