Simplified the code further.