Code formatting
Some variable and class renaming