Nit: More blank lines than really needed?