Improved code legbilty

Better content loading