Clean up codes
increased padding