Cleaned up some changes suggested