Fixed warnings, cleaning & cosmetics