Code Cleanup

No new functionality has been added