Changes to support IDEA + code formatting