formatting
Improved design