Formatting, removed useless stuff