[#31] Fixed indentations in finish! method and improved saving to database