Code style and few minor fixes for Prime Time.