Removed confusing and unnecessary parts