Main class improvements, initializing methods