Fixed imports and added comments