Minor refactoring (used Alba.Framework methods where possible)