Fix import order + code clean up