Clean inliners up + back to KeyMaster signature
Package stuff