Few bits of refactoring for parallax. <Jaideep>