code cleanup (extract) + more present commented sections