MULE-7052 - fixing code style and adding static imports