Checkstyle

Ian looked over it. Just gonna merge it myself.