Broke stuff out, making it more ruby like