Refactored a bit, and fixed a few glitches regarding beautifulness :-P