Code cleanup as per AndroidLint