Fixed NPE, Cleaned console interface