Added scripts path and cleaned up a little