updating formatting system, improving styling