Cleanup code and add FIX comment