Deleted the Some Methods and cleaned code up