some style and naming changes