Minor Changes & organization