Fixing some comments, spacing, removing unnecessary code