Refactory tons of stuff