Improve requires
Formatting
Specs refactoring