Removed useless stuff & formatting