removed unnecessary methods, better method body