Some style and structure changes