lib: do cosmetic changes (PR #48 & #30)