Moved initialization to another method