cleaned hardcoded stuf