Removed .idea and correct some mistakes