Got Rid of Junk Code

Starting to look impressive!