removed necessity for padding
cleanup