Minor styles fixes and semanticisms