fix issues raised by phpmd
start fixing code style errors