Final Code Cleanup part 3