Restructured methods to seperate concerns