Global cleanup, unconsistent code style :(