Made use of less functionality
Some code clean up
helper scripts