cleaned up the code, removed all dependencies and tested it on pc and tablet