Optimize imports + reformat a tiny bit

Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>