Minor aesthetic changes, minor code cleanup