Small changes
Style changes and minor fixes