#76 Add Souce Comment & Refactoring