Easier customization, code cleanup