Formatting and Fixed bug