Modifications for better readability