some cleanup
Some changes in style (dont untabify in iwb function, linux is default style)