indentation changes + minor refactor