Clean up codestyle
Working on helpers