[+]: fixed more code-style and move commands to the right "lib"