Some light improvements and cleanup