#454 - Checkstyle fixes from merges
#454 - Checkstyle fix from merges
#454 - Checkstyle fix from merges