Cleaned up --- removed private method
Finished cleaning up!