Small changes in styles and refatoring