Code formatting and some renaming