Some little code optimizing
Some renaming and first iteration of #12