Removed all id's. Code is cleaner