Aligned Read Refactoring - pass 1