Fix warnings and code style resulting from #25