Removed Spagetti Code