[#1817] code cleanup
[#1817] code cleanup

PaulVanSchayck/irods,janiheikkinen/irods,PaulVanSchayck/irods,leesab/irods,leesab/irods,PaulVanSchayck/irods,PaulVanSchayck/irods,PaulVanSchayck/irods,janiheikkinen/irods,leesab/irods,janiheikkinen/irods,janiheikkinen/irods,janiheikkinen/irods,PaulVanSchayck/irods,janiheikkinen/irods,janiheikkinen/irods,leesab/irods,leesab/irods,PaulVanSchayck/irods,PaulVanSchayck/irods,PaulVanSchayck/irods,leesab/irods,leesab/irods,janiheikkinen/irods,janiheikkinen/irods