Insert and save refactoring
Removed return flags
Removed mistakes
Merge pull request #34 from Hantim/Insert_Refactoring

Insert and save refactoring