Code Cleanup

Performed some basic code cleanup.