Plus minor repositioning for better readability