Made neat style changes