Went back to original alignment implementation and added in fix to allow for leading whitespace