Fix: code cleanup
Merge pull request #4 from muminoff/develop

Fix: code cleanup