disabled comment button
code cleanup