Refactor For Release First Beta Version