Did some code styling for readability