Fix Wilson and clean code heavily