Minor aesthetic code alterations