Code format fixes and styles issues