Use module manager for package name lookup, indentation and todo cleanup