#36 - fixing formatting