Code cleanup
More eagerly display usage
More colorized output