add solution & fix indent