indentation and compilation fixes