cleanup and update adding mouse to src