new format
fixes
Merge pull request #1 from ralreegorganon/refactoring

Refactoring