Changed padding handling & deleted unused file