fixed codestyle and interfaces