Simplified avatar loading + added comments