[#788] Code cleanup