Fixed #16 and did reformat