Minor code refactoring and minSDK changed to 18.