cleanup of stying to make it simpler