added const + cleanup