Clean up and warnings for #123