Simplified and tidy up