Addressed style comments from Ryan LeCompte