Tidy up console messages. TODO: Add proper logging and log levels.