Code style and fixing running on packages directly.