- code cleanup and adjustments