some cleanup, better spacing