Update CarrierWave.java

Variable re-arrangement and improvements