Improve Console to be easily maintainable.