Added assertion
Removed unneeded dependency
Changed messages
Simplification
Formatting & optimized imports