Code cleanup: ran organize using and code formatting on all CS files