Clean code and begin work for Events fragment