cosmetic changes with complete working for existing functions