code cleaning
cosmetic changes
print methods