Some beauty changes
Some more beauty changes and renaming of methods to meet the
requirements