Cleaned up changes