added comments and made order of attributes consistent