some code cleanup
push test