Made aggressive style changes