Aww Yeah

Done Some code fixing to make it readable.
Mystery Conflicts!