diff --git a/libraries/gpu/src/gpu/Resource.cpp b/libraries/gpu/src/gpu/Resource.cpp
index 085d97184b..f59152550b 100644
--- a/libraries/gpu/src/gpu/Resource.cpp
+++ b/libraries/gpu/src/gpu/Resource.cpp
@@ -95,7 +95,7 @@ Resource::Sysmem::~Sysmem() {
 
 Resource::Size Resource::Sysmem::allocate(Size size) {
     if (size != _size) {
-        Byte* newData = 0;
+        Byte* newData = NULL;
         Size newSize = 0;
         if (size > 0) {
             Size allocated = allocateMemory(&newData, size);
@@ -116,7 +116,7 @@ Resource::Size Resource::Sysmem::allocate(Size size) {
 
 Resource::Size Resource::Sysmem::resize(Size size) {
     if (size != _size) {
-        Byte* newData = 0;
+        Byte* newData = NULL;
         Size newSize = 0;
         if (size > 0) {
             Size allocated = allocateMemory(&newData, size);
@@ -196,11 +196,11 @@ Buffer& Buffer::operator=(const Buffer& buf) {
 Buffer::~Buffer() {
     if (_sysmem) {
         delete _sysmem;
-        _sysmem = 0;
+        _sysmem = NULL;
     }
     if (_gpuObject) {
         delete _gpuObject;
-        _gpuObject = 0;
+        _gpuObject = NULL;
     }
 }
 
diff --git a/libraries/gpu/src/gpu/Resource.h b/libraries/gpu/src/gpu/Resource.h
index ec528c230b..2ec616251c 100644
--- a/libraries/gpu/src/gpu/Resource.h
+++ b/libraries/gpu/src/gpu/Resource.h
@@ -82,10 +82,8 @@ protected:
         inline const Byte* readData() const { return _data; } 
         inline Byte* editData() { _stamp++; return _data; }
 
-        template< typename T >
-        const T* read() const { return reinterpret_cast< T* > ( _data ); } 
-        template< typename T >
-        T* edit() { _stamp++; return reinterpret_cast< T* > ( _data ); } 
+        template< typename T > const T* read() const { return reinterpret_cast< T* > ( _data ); } 
+        template< typename T > T* edit() { _stamp++; return reinterpret_cast< T* > ( _data ); } 
 
         // Access the current version of the sysmem, used to compare if copies are in sync
         inline Stamp getStamp() const { return _stamp; }
@@ -210,11 +208,7 @@ public:
 
     //Template iterator with random access on the buffer sysmem
     template<typename T>
-    class Iterator : public std::iterator<std::random_access_iterator_tag,
-                                               T,
-                                               Index,
-                                               T*,
-                                               T&>
+    class Iterator : public std::iterator<std::random_access_iterator_tag, T, Index, T*, T&>
     {
     public: