little code cleanup
little code cleanup 2