style and code fix