Minor bug fix, style code elements