Code cleanup1

made code more consistent