Removed too many lines, added end keyword back