added better style and stuff