Clean up imports and comparison
Improved layout efficiency