Fix close event definition and stylistic corrections