Moved padding into class