Refactoring of the albums form, add comment on the core module