cleanup & further indentation