Progra B3A4 Bonus provisorisch final; Refactoring in A2&A4