Cleaned code a bit
Added align blocking method