Little Code cleanup