previous style updates and cleanup