Removed extra spacing and commented code from files