clean up whitespace, import order, file hierachy