Interface members made const + code cleanup