Some formatting changes to conform to Android standards.