Restructured code to make it easier to read through