Improved style (mostly due to jstrac post)