further cleanup and addition of convenience parameter annotations