Simplified the id selectors