Code clean - up