Simplified the code quick.