Fixed alligment and changed block to end of line if