Fixed formatting. Removed depdency of apache commons.