Addressed comments + formatting.