Start to organize code better