Code formatting clean-up.
Android Lint warning clean-up.