Added usual scripts and refactored boilerplate code
Minor update