made code format uniform