Cleanups and modify albums post type