Some rearranging to make it work in Firefox
white space cleanup