minor design updates and cleanup