Fix percentage calculation
Cleanup