Formatting and few modification