adjusted the grammar a bit and optimized imports