added console format
naming cleanup