Restructured Code a bit
Changed minor stuff