Changed structure for better readability