Removed some superfluous code, added stupid comments