commentary comment
move a macro to pow-helpers
change declaration order
rename
Merge pull request #30 from yukihr/refactoring

refactoring