small code cleanup/order;
some basic styles;