Cleaned up for class
Fixed address