Code indention and remove invalid function