Cleaned up GetId