v0.1.5 => Removed logd and refactored code