Renaming badly named method
Making query a bit faster
Adding comment on event functionality