Cleaned up a bit. Newlines. Removed dangling commented lines.