Move these inside __init__ ?