Minor bug fix and style change