Fixed tab size and added comments