Reformatted code and organized imports