Description:
code cleanup