housecleaning: reformat code and optimize imports

Signed-off-by: Arnav Gupta <championswimmer@aokp.co>