Added improvements to source code format and imports organization.