cleanup & indentation