Made code more "Agile"