Moved stars further back and deleted some unused variables