some more code prettification
some more code pretifications made