Added comments + cleaned unused attributes