Add some spaces and move some vars into class