clean, comment and moved back to brackets (for readability)