Issue #8 : Adding pointer cursor and clean some code