add handler comments, minor style updates