Fixed mouse bug + more cleaning