Refactoring + Added Pad method