Made it a little prettier, made the code better maintained.