removing dependencies and simpler naming