Cleaned warnings. Improved structure.