missing a space
fix wrong id parameter. also clean up a bit