fixing lint & format issues