code syle cleanup