Fixed maven dependencies, minor code formatting.