Edited file comment and added Event class