Code Cleanup

Minor formatting adjustments, removed extraneous comments and code.