Codestyle and readability improved