fixed code style mostly