Rename everything. Four space indent everywhere.