reformating code and optimize imports