Fixed warnings and weird indentation