Refactor events, add construct, remove load events