code cleanup
little more fix