Code Alignment refactoring and removal of short open tags