Cleanup and update to styles