custom command handling
remove tracking code
minor style fix