code clean-up / indentation fixes