Updated with checkStyle fixes