Made changes following @timgraham suggestions. #2