Move into namespace, correct some spelling, use use a bit more