Deleted commented out lines
Made pretty
Changes for new Beta