Fixed warnings
Fixed indentation