Did some fast cleanup before starting with some keyboard hooking