Adding style changes and cleanup