Current can be null, for the sake of ease.

Cleanup + minor formatting