Fixed library developer guideline violations.
Resolved merge conflicts