More efficient code

Just make more efficient code.