Cleanup

Changes as per @chillu's (sensible) requests