changed method name to improve readibility and removed some class attributes