warning bugfix | functions refactor