Fix bug
New shortcuts
Moved funcs to tools
Moved func to tools
Formatting