#125 cleanup and lint, test alignment.