Minor aesthetic and naming changes made