Reformat & removed useless code