Add better practices
Update for Nexus 5 phone