removed garbage code, cleaned up indenting