- Removed tabs for spaces
- Added docblocks
- Optimized factories