fix bug + commit file style