Removed unneeded parts and reformatted