Cleanup and add basic security
Merge pull request #1 from MartynasM/feature/cleanup_and_user_security

Cleanup and add basic security