more prettification, made static stuff static