Code cleanup
A bit more power reduction