Edited file to be better, and more consistent.