#46: Checkstyles rules applied and code updated.