Cleaned Code and fixed Comments

Fixed some minor comments and cleaned some more