Fixed root package bug
tweaked code formatting rules