Reorganized some methods