untabify/cleanup code