Changed some comments and removed left over testing Log.d