Code Cleanup, Update Metrics