removed unnecessary usage of classes