Cleaned up console version a bit.