General code improvement and implementation.