code cleanup
better naming