Deleted junk & refactoring
Fixed event handler herp