responsive improvements and cleanup