some haml, some cleanup, some cc lic, some ..?