AMEC-1954 organized imports (removed unnecessary one and replaced the wildcard import with explicit class names)
AMEC-1954 removed the extra indent on return line