Cleaned it up, better or not @tjaskula ?