cleaned up comments and tab vs. space issues