Few more tweaks and some restructuring@