Formatting and remove debug codes