Fix some lint, indentation issues