Cleaned up commit for #259