code cleanup and code commenting <EOD>