Mainly beautification fixes.
convert tabs to spaces