Cleaned up and ready for merge