remove hardcoded padding, add configurable value