fixed some styleCop violations