Small fixes and Style changes