Code now conforms to astylerc