Code cleanup

More streamlined, but less readable...