Made Commands field to private commands
We dont need the name of the package anymore as its defined in map
Calling filter function in ones that are passed through
Tabs to spaces