Made formatting consistent (mostly changed tabs into spaces)
 * No code changes