house-keeping: commented all closing tags / removed irrelevent code